Merge remote-tracking branch 'savannah/master' into native-comp

diff --cc etc/NEWS
Simple merge

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/progmodes/cc-bytecomp.el
Simple merge

diff --cc lisp/progmodes/cc-langs.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/window.c
Simple merge